Update the macro id generation to occur in sorted order.

This issue is somewhat difficult to trigger, but any expression
with two macros present within it should eventually trip the issue.

The test has been updated to removed some redundant conditions
which were extant once the macro tracking in the test optimizer
was fixed to reflect how macro id tracking works within the production
optimizers.